Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

super speshul m4ra #89

Merged
merged 21 commits into from
Jan 18, 2024
Merged

super speshul m4ra #89

merged 21 commits into from
Jan 18, 2024

Conversation

bearrrrrrrr
Copy link
Contributor

@bearrrrrrrr bearrrrrrrr commented Jan 10, 2024

About the pull request

super speshul M4RA that will have overpen, spawning in SL room to distribute as/if they see fit. depleted uranium that (i think) reduces armor, does toxin damage, and overpens. ofc, can also just make it A Normal Thing The M4RA Does if wanted, but i thought it'd be nice to isolate it to one gun just for clarity's sake.

currently spawns in gunny's room to give out. suggestions if gunny hoards include replacing one shotty spawn, making it a 50/50 spawn, giving it to lt, making a vendor(eugh)

Explain why it's good for the game

image

Testing Photographs and Procedure

Screenshots & Videos

it's an urban camo M4RA with this on the end.
image
image

Changelog

🆑
add: M4RA to SL room to distribute as they see fit
/:cl:

@bearrrrrrrr bearrrrrrrr changed the title [WIP] super speshul m4ra super speshul m4ra Jan 11, 2024
Copy link

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@morrowwolf
Copy link
Member

Conflicts and drathek review

@morrowwolf morrowwolf marked this pull request as draft January 15, 2024 17:40
# Conflicts:
#	maps/map_files/golden_arrow/golden_arrow.dmm
Copy link

Conflicts have been resolved. A maintainer will review the pull request shortly.

@bearrrrrrrr
Copy link
Contributor Author

image

code/modules/projectiles/guns/rifles.dm Outdated Show resolved Hide resolved
Copy link
Contributor

@Drulikar Drulikar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Small nitpicks but otherwise code looks fine. Not used it in game.

code/modules/projectiles/guns/rifles.dm Outdated Show resolved Hide resolved
code/datums/ammo/bullet/rifle.dm Outdated Show resolved Hide resolved
code/modules/projectiles/gun_attachables.dm Outdated Show resolved Hide resolved
code/modules/projectiles/gun_attachables.dm Outdated Show resolved Hide resolved
@bearrrrrrrr bearrrrrrrr marked this pull request as ready for review January 16, 2024 12:28
Copy link
Contributor

@Drulikar Drulikar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code changes look fine.

@FslashN FslashN merged commit 052a218 into cmss13-devs:master Jan 18, 2024
30 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants